Revert the change from yesterday, since it leads to assertion failures.

2005-10-04  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkrc.c (gtk_rc_clear_realized_style): Revert the change
	from yesterday, since it leads to assertion failures.  (#317879,
	Sebastian Bacher)

diff --git a/ChangeLog b/ChangeLog
index 63eadd987e2a342f13268b0cfe1c459a7fa6a1da..6c75b2518172bc49cc1e04dde807931fdad7f2df 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-10-04  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkrc.c (gtk_rc_clear_realized_style): Revert the change
+       from yesterday, since it leads to assertion failures.  (#317879,
+       Sebastian Bacher)
+
 2005-10-03  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkcalendar.c (gtk_calendar_init): Call 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 63eadd987e2a342f13268b0cfe1c459a7fa6a1da..6c75b2518172bc49cc1e04dde807931fdad7f2df 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2005-10-04  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkrc.c (gtk_rc_clear_realized_style): Revert the change
+       from yesterday, since it leads to assertion failures.  (#317879,
+       Sebastian Bacher)
+
 2005-10-03  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkcalendar.c (gtk_calendar_init): Call 

diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c
index d02f289601ef79b0392224c2a24b86bf1b308862..ee0899d3e630220dd929dd8648e2348aabc025d7 100644 (file)
--- a/gtk/gtkrc.c
+++ b/gtk/gtkrc.c
@@ -1337,9 +1337,6 @@ gtk_rc_clear_realized_style (gpointer key,
 {
   GSList *rc_styles = key;
   GSList *tmp_list = rc_styles;
-  GtkStyle *style = value;
-
-  g_object_unref (style);
  
   while (tmp_list)
     {